Updates from other forks by BatmanAoD · Pull Request #1 · rigetti/hyper-proxy

BatmanAoD · 2026-04-17T20:03:26Z

See upstream_commit_recommendations.txt, written by Claude Haiku 4.5. Claude then created a merge request with the described commit chain and manual changes.

I selected the name rigetti-hyper-proxy for the crate.

The final commit, "do a few more dependency updates," is from simply running cargo upgrade -i. (The "upgrade" command comes from cargo-edit.)

Rather than merging this, we should simply switch the default branch to main once we're satisfied that this looks correct.

Co-authored-by: Michał Smolarek <34063647+Razz4780@users.noreply.github.com>

call set_authorization when creating a Proxy

1.1.0

…om-dependencies remove unused rustls-native-certs crate from dependencies

BatmanAoD · 2026-04-17T20:04:02Z

We should also delete this fork: https://github.com/rigetti/hyper-proxy2

BatmanAoD · 2026-04-17T20:05:52Z

+            override: true
+      - uses: katyo/publish-crates@v2
+        with:
+            registry-token: ${{ secrets.CRATES_IO_SECRET }}


We'll need to add this: https://github.com/rigetti/hyper-proxy/settings/secrets/actions

jselig-rigetti

Once tests are passing, this looks reasonable

jselig-rigetti · 2026-04-17T20:11:29Z

We should also delete this fork: https://github.com/rigetti/hyper-proxy2

@BatmanAoD Ok, I've archived it

BatmanAoD · 2026-04-20T19:47:35Z

I'm going to delete the LLM-generated recommendations file. Here are the contents, for posterity.

Here's my assessment of all commits in main.., grouped by fork:

hyper-http-proxy fork

Commit	Message	Recommendation
`tlnmuprv`	update dependencies (tokio-rustls 0.25→0.26, hyper-rustls 0.26→0.27)	KEEP — but superseded by later commits; only needed if taking partial chain
`xlwskxwp`	Refactor (new feature naming, drop openssl, rename webpki→rustls-webpki)	KEEP — major structural improvement; drops openssl-tls support (intentional in this fork)
`lotvxkwy`	rename to hyper-http-proxy (package name + 1.0.0)	KEEP with modification — take the Cargo.toml/README/LICENSE changes, but you'll want to decide on your own version numbering and crate name
`okyzxmwl`	hygiene (remove rustls-tls/rustls-tls-manual-roots aliases, update README)	KEEP
`rpvqwonu`	lint (fix CI `--features` flags, add `CustomProxyCallback` type alias, minor lints)	KEEP
`xlmqyxqu`	release (add release.yaml CI workflow)	DISCARD — MetalBear's CI setup, not yours
`pmxowuno`	fix test (remove rustls-tls-manual-roots from CI since feature was removed)	KEEP
`rvlmmzus`	`..` (1.0.0 tag; likely just Cargo.lock update)	DISCARD — noise commit
`tzpxxmtk`	call set_authorization when creating a Proxy (auto-extract credentials from URI)	KEEP — useful feature with tests
`qsxzsozm`	Update lib.rs (refactor extract_user_pass: rsplit_once, avoid allocation)	KEEP
`pspprnvv`	add doc (docstring for `extract_user_pass`)	KEEP
`ztllkrlr`	cargo fmt --all	KEEP
`spnpoosu`	1.1.0 version bump	KEEP (re-version as appropriate)
`ozuxnknk`	remove unused rustls-native-certs direct dep (let hyper-rustls handle it)	KEEP
`uqkvyvqt`	Bump 1.1.0→1.1.1, fix missing trailing newline in Cargo.toml	KEEP (re-version as appropriate)

hyper-proxy2 fork

Commit	Message	Recommendation
`ovssllkp`	feat: Upgrade to http/hyper 1.0	DISCARD — foundation for both forks; hyper-http-proxy's chain is a superset of this work
`mvrkoylw`	ci: Add GitHub Actions workflow	DISCARD — superseded by hyper-http-proxy's CI (which has better feature matrix)
`vmzzswov`	fix: Use from_proxy_unsecured in examples for no-tls/native-tls	DISCARD — the example and feature names changed in hyper-http-proxy refactor
`zxrptwwl`	chore: Fix doc URL, bump MSRV to 1.70	DISCARD — doc URL is for siketyan's fork; MSRV bump is worth keeping conceptually but re-apply manually
`qupmtylz`	ci: Remove Travis CI	DISCARD — already absent in hyper-http-proxy chain
`qrqymtru`	Do not crash if path is missing (`.unwrap()` → `.ok_or_else()`)	KEEP — genuine bug fix not present in hyper-http-proxy chain; should be cherry-picked
`rsrxxons`	Bump tokio-rustls 0.25→0.26, hyper-rustls 0.26→0.27, webpki-roots 0.26→1.0.3	DISCARD — tokio-rustls/hyper-rustls bump is in hyper-http-proxy chain; webpki-roots bump to 1.0.3 may conflict with hyper-http-proxy's 0.26

Summary: Take the full hyper-http-proxy chain (minus xlmqyxqu release.yaml and rvlmmzus noise), plus cherry-pick qrqymtru from hyper-proxy2 for the panic fix. The hyper-proxy2 branch is otherwise entirely superseded.

One thing to decide before you start: do you want to keep the crate name as hyper-proxy or adopt hyper-http-proxy? That affects how you handle lotvxkwy.

… Action

BatmanAoD · 2026-04-20T21:41:32Z

Closing now that main is the default branch.

siketyan and others added 26 commits January 14, 2024 21:08

feat: Upgrade to http / hyper 1.0

c88b416

ci: Add GitHub Actions workflow

d2cf0fe

fix: Use from_proxy_unsecured for no-tls and native-tls in examples

47231a8

chore: Fix documentation URL, Bump MSRV to 1.70

0d2dfbc

ci: Remove Travis CI

c73c891

update dependencies

4f72433

Refactor

5f85b4a

rename to hyper-http-proxy

a38c482

hygiene

51047db

lint

53e8b08

release

1f568f1

fix test

a7bd4cc

..

4c88862

call set_authorization when creating a Proxy

505ce12

Update src/lib.rs

e8d59b6

Co-authored-by: Michał Smolarek <34063647+Razz4780@users.noreply.github.com>

add doc

cd6074e

cargo fmt --all

475fdfd

Merge pull request tafia#2 from goenning/main

1cd05bb

call set_authorization when creating a Proxy

1.1.0

8b0e4d7

Merge pull request tafia#3 from metalbear-co/1.1.0

c7b29b1

1.1.0

remove unused rustls-native-certs crate from dependencies

cd70c13

Merge pull request tafia#4 from tottoto/remove-rustls-native-certs-fr…

3591f61

…om-dependencies remove unused rustls-native-certs crate from dependencies

Bump version from 1.1.0 to 1.1.1

add3c42

Claude recommends upstream commits

b47c9cf

Cherry-pick panic fix and rename crate to rigetti-hyper-proxy

429b32b

do a few more dependency upgrades

bdcbad9

BatmanAoD commented Apr 17, 2026

View reviewed changes

jselig-rigetti approved these changes Apr 17, 2026

View reviewed changes

Comment thread Cargo.toml Outdated

Comment thread Cargo.toml Outdated

Comment thread README.md

Comment thread LICENSE-MIT.md

Comment thread src/stream.rs

rigetti deleted a comment from BatmanAoD Apr 17, 2026

BatmanAoD commented Apr 17, 2026

View reviewed changes

Comment thread LICENSE-MIT.md

BatmanAoD added 2 commits April 20, 2026 12:46

add our copyright to the license file

1019e98

replace MetalBear with Rigetti where appropriate

61647e4

BatmanAoD added 6 commits April 20, 2026 13:48

cargo fmt

ed2246e

remove LLM recommendations file (see PR #1)

aaaee80

fix 'example' project feature-flags

cba758c

clippy-fix

76cf405

GPT-5.3 fixes incompatible-feature compilation issue

e7d6eaf

restore 'rustls' feature for existing usage; use cargo-hack in GitHub…

1bcd38d

… Action

BatmanAoD force-pushed the main branch from f689f99 to 1bcd38d Compare April 20, 2026 20:30

BatmanAoD deleted the branch master April 20, 2026 21:41

BatmanAoD closed this Apr 20, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates from other forks#1

Updates from other forks#1
BatmanAoD wants to merge 34 commits intomasterfrom
main

BatmanAoD commented Apr 17, 2026

Uh oh!

BatmanAoD commented Apr 17, 2026

Uh oh!

BatmanAoD Apr 17, 2026

Uh oh!

jselig-rigetti left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jselig-rigetti commented Apr 17, 2026

Uh oh!

Uh oh!

BatmanAoD commented Apr 20, 2026

Uh oh!

BatmanAoD commented Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

BatmanAoD commented Apr 17, 2026

Uh oh!

BatmanAoD commented Apr 17, 2026

Uh oh!

BatmanAoD Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

jselig-rigetti left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jselig-rigetti commented Apr 17, 2026

Uh oh!

Uh oh!

BatmanAoD commented Apr 20, 2026

hyper-http-proxy fork

hyper-proxy2 fork

Uh oh!

BatmanAoD commented Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants